Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PERK p2 #1871

Closed
wants to merge 76 commits into from
Closed

PERK p2 #1871

wants to merge 76 commits into from

Conversation

warisa-r
Copy link
Contributor

Hello,

this branch adds a new time integrator of second-order paired explicit Runge-Kutta method.
It contains the time integrator, a polynomial optimizer for the method, and a new elixir employing the second-order P-ERK time integration scheme with 6 stages.

DanielDoehring and others added 30 commits January 29, 2024 10:06
@DanielDoehring
Templates for PERK p2, p3
befd590
@DanielDoehring
example
0b378f7
@warisa-r
constructor changed
42c74d1
@warisa-r
Modified so that both of the constructor stay
04784df
@DanielDoehring
Merge pull request #20 from warisa-r/PERK_p2p3_Single
3fcad2a 
Constructor modified
@DanielDoehring
bring back eps
55f4165
@DanielDoehring
correct val
6a31a0b
@warisa-r
add constructor of PERK3
87399dc
@warisa-r
minor fixes
e518386
@warisa-r
function and variable name adjustments
a1222d7
@warisa-r
spelling fix
483015b
@DanielDoehring
Merge branch 'PERK_p2p3_Single' into PERK_p2p3_Single
de86860
@DanielDoehring
Merge pull request DanielDoehring#21 from warisa-r/PERK_p2p3_Single
6436708 
Add constructor of PERK3
@warisa-r
Change names and spacing according to style guide
03f0af1
@warisa-r
Merge branch 'PERK_p2p3_Single' of github.com:warisa-r/Trixi.jl into …
5a13446 
…PERK_p2p3_Single
@warisa-r
spelling correction
e182a89
@warisa-r @DanielDoehring
Apply suggestions from code review
08b70d6 
Co-authored-by: Daniel Doehring <doehringd2@gmail.com>
@DanielDoehring
Merge pull request DanielDoehring#24 from warisa-r/PERK_p2p3_Single
9881351 
Perk p2p3 single
@DanielDoehring
snake case
bdb2db5
@DanielDoehring
Merge branch 'PERK_p2p3_Single' of github.com:DanielDoehring/Trixi.jl…
19a1653 
… into PERK_p2p3_Single
@DanielDoehring
revisit perk single p2 p3
df4733d
@DanielDoehring
fmt
ee9e569
@DanielDoehring
fmt
32cbb1e
@DanielDoehring
Merge branch 'main' into PERK_p2p3_Single
be8ea21
@DanielDoehring
semantic ordering
e3ec50c
@DanielDoehring
add literature
fbcd6e3
@warisa-r
Strip code of p = 3
b1b6d7c
@warisa-r
Add the line to show the error of the elixir
33bb8da
@warisa-r
Make adjustments to a test file and delete example of PERK3
5f763bb
@warisa-r @DanielDoehring
Update Project.toml
9149b7b 
Co-authored-by: Daniel Doehring <doehringd2@gmail.com>
@DanielDoehring DanielDoehring added the enhancement New feature or request label Mar 15, 2024
@DanielDoehring DanielDoehring self-assigned this Mar 15, 2024
@DanielDoehring
Copy link
Contributor

DanielDoehring commented Mar 17, 2024 •
edited
Loading

For some reason the SummaryCallback causes the allocations causing the test to fail.

This is observed also for the other custom integrators, see

Trixi.jl/test/test_tree_2d_advection.jl

Lines 153 to 166 in 2dfde7f

@trixi_testset "elixir_advection_timeintegration.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_timeintegration.jl"),
l2=[2.4976030518356626e-5],
linf=[0.0005531580316338533],
# Let this test terminate by time instead of maxiters to cover some lines
# in time_integration/methods_2N.jl
coverage_override=(maxiters = 10^5, tspan = (0.0, 0.1)))
# Ensure that we do not have excessive memory allocations
# (e.g., from type instabilities)
let
t = sol.t[end]
u_ode = sol.u[end]
du_ode = similar(u_ode)
@test (@allocated Trixi.rhs!(du_ode, u_ode, semi, t)) < 15000

and the other tests.

@DanielDoehring DanielDoehring mentioned this pull request Mar 18, 2024
Open
@DanielDoehring
Copy link
Contributor

DanielDoehring commented Mar 18, 2024 •
edited
Loading

Not sure if I can add a version for DelimitedFiles as I get for DelimitedFiles = "1.9.0"

  ERROR: LoadError: Unsatisfiable requirements detected for package DelimitedFiles [8bb1440f]:
 DelimitedFiles [8bb1440f] log:
 ├─possible versions are: 1.9.0-1.9.1 or uninstalled
 └─restricted to versions 1.8.5-1.8 by Trixi [a7f1ee26] — no versions lef

and for DelimitedFiles=1.8.5 (for which no release seems to exist)

 ERROR: LoadError: Unsatisfiable requirements detected for package DelimitedFiles [8bb1440f]:
DelimitedFiles [8bb1440f] log:
├─possible versions are: 1.8.5 or uninstalled (package in sysimage!)
└─restricted to versions 1.9.0-1 by Trixi [a7f1ee26] — no versions left

@JoshuaLampert

@JoshuaLampert
Copy link
Member

Yes, for the Downgrade action that's to be expected as DelimitedFiles is a stdlib. It should be added to the list of skipped libraries. The compat could then be DelimitedFiles = "1.9.0". You could also try DelimitedFiles = "1".

@JoshuaLampert
Copy link
Member

A bit of context for why we need the compat: https://discourse.julialang.org/t/psa-compat-requirements-in-the-general-registry-are-changing/104958 and #1711.

@DanielDoehring
Copy link
Contributor

You could also try DelimitedFiles = "1".

That seems to work, thanks!

@DanielDoehring DanielDoehring marked this pull request as draft March 27, 2024 15:29
@warisa-r
Copy link
Contributor Author

Close this one for now. Working on making Convex and ECOS extensions rather than direct dependencies.

@warisa-r warisa-r closed this Apr 17, 2024
@warisa-r warisa-r mentioned this pull request May 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanielDoehring DanielDoehring DanielDoehring requested changes

@JoshuaLampert JoshuaLampert JoshuaLampert left review comments

@ranocha ranocha ranocha left review comments

Assignees

@DanielDoehring DanielDoehring

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@warisa-r @DanielDoehring @JoshuaLampert @ranocha